1T External Hard drive...plus another external hard drive for back up. Then an online storage space similar to Google Docs. I organize by year, month, then day/shoot. Within each individual folder, I add an "Edit" folder so I don't have to worry about duplicates and all my best pics are easily found without scrolling through originals and edits. Same with videos. All training vids get their own folder and I separate by focus (Close the Door, Sit Pretty, etc) + date.