diff --git a/accidents/sweeper-fail.gif b/accidents/sweeper-fail.gif
deleted file mode 100644
index ed6abc6f5..000000000
Binary files a/accidents/sweeper-fail.gif and /dev/null differ
diff --git a/accidents/toll-booth-ramp.gif b/accidents/toll-booth-ramp.gif
deleted file mode 100644
index b21e49ba0..000000000
Binary files a/accidents/toll-booth-ramp.gif and /dev/null differ
diff --git a/agree/yup.gif b/agree/yup.gif
deleted file mode 100644
index ff35e4c2c..000000000
Binary files a/agree/yup.gif and /dev/null differ
diff --git a/aha/aha.gif b/aha/aha.gif
deleted file mode 100644
index d05564af2..000000000
Binary files a/aha/aha.gif and /dev/null differ
diff --git a/arnold/arnold.gif b/arnold/arnold.gif
deleted file mode 100644
index 505b1d09c..000000000
Binary files a/arnold/arnold.gif and /dev/null differ
diff --git a/austin-powers/mole.gif b/austin-powers/mole.gif
deleted file mode 100644
index 67ef478be..000000000
Binary files a/austin-powers/mole.gif and /dev/null differ
diff --git a/awkward/white-guys.gif b/awkward/white-guys.gif
deleted file mode 100644
index 0f9ddddd4..000000000
Binary files a/awkward/white-guys.gif and /dev/null differ
diff --git a/banned/thor-banhammer-avengers.gif b/banned/thor-banhammer-avengers.gif
deleted file mode 100644
index 4e40df8fb..000000000
Binary files a/banned/thor-banhammer-avengers.gif and /dev/null differ
diff --git a/bboy/breakdancing.gif b/bboy/breakdancing.gif
deleted file mode 100644
index 232f01fc9..000000000
Binary files a/bboy/breakdancing.gif and /dev/null differ
diff --git a/epic/atomic_bomb.gif b/boom/atomic_bomb.gif
similarity index 100%
rename from epic/atomic_bomb.gif
rename to boom/atomic_bomb.gif
diff --git a/boom/headshot-bball.gif b/boom/headshot-bball.gif
deleted file mode 100644
index 9407e7268..000000000
Binary files a/boom/headshot-bball.gif and /dev/null differ
diff --git a/boom/headshot.gif b/boom/headshot.gif
deleted file mode 100644
index 2711b9341..000000000
Binary files a/boom/headshot.gif and /dev/null differ
diff --git a/boom/punch.gif b/boom/punch.gif
deleted file mode 100644
index 369dead62..000000000
Binary files a/boom/punch.gif and /dev/null differ
diff --git a/bring-it/bring-it-psycho-cat.gif b/bring-it/bring-it-psycho-cat.gif
deleted file mode 100644
index 7635f1b37..000000000
Binary files a/bring-it/bring-it-psycho-cat.gif and /dev/null differ
diff --git a/burn/aww-snap-monsters-inc.gif b/burn/aww-snap-monsters-inc.gif
deleted file mode 100644
index 1a0d099e7..000000000
Binary files a/burn/aww-snap-monsters-inc.gif and /dev/null differ
diff --git a/burn/ohh-burn-cartoon.gif b/burn/ohh-burn-cartoon.gif
deleted file mode 100644
index 907aac221..000000000
Binary files a/burn/ohh-burn-cartoon.gif and /dev/null differ
diff --git a/cats/balloon-scares-cat.gif b/cats/balloon-scares-cat.gif
deleted file mode 100644
index 60bc2c5ac..000000000
Binary files a/cats/balloon-scares-cat.gif and /dev/null differ
diff --git a/cats/cat-fail.gif b/cats/cat-fail.gif
deleted file mode 100644
index 8cc4599ab..000000000
Binary files a/cats/cat-fail.gif and /dev/null differ
diff --git a/cats/cat-mirror.gif b/cats/cat-mirror.gif
deleted file mode 100644
index bf3419896..000000000
Binary files a/cats/cat-mirror.gif and /dev/null differ
diff --git a/cats/cat-scare-jurassic-park.gif b/cats/cat-scare-jurassic-park.gif
deleted file mode 100644
index 300d923a6..000000000
Binary files a/cats/cat-scare-jurassic-park.gif and /dev/null differ
diff --git a/cats/falling-cat-car-window.gif b/cats/falling-cat-car-window.gif
deleted file mode 100644
index 84666e07e..000000000
Binary files a/cats/falling-cat-car-window.gif and /dev/null differ
diff --git a/cats/shhhhhh.gif b/cats/shhhhhh.gif
deleted file mode 100644
index c141891c7..000000000
Binary files a/cats/shhhhhh.gif and /dev/null differ
diff --git a/cats/snuggle-cat.gif b/cats/snuggle-cat.gif
deleted file mode 100644
index 139c0acf9..000000000
Binary files a/cats/snuggle-cat.gif and /dev/null differ
diff --git a/cats/toast-scares-cat.gif b/cats/toast-scares-cat.gif
deleted file mode 100644
index 4152b31f1..000000000
Binary files a/cats/toast-scares-cat.gif and /dev/null differ
diff --git a/cats/upvote-cat.gif b/cats/upvote-cat.gif
deleted file mode 100644
index 5511f5cde..000000000
Binary files a/cats/upvote-cat.gif and /dev/null differ
diff --git a/chris-farley/matt-foley-jacksqwat-o.gif b/chris-farley/matt-foley-jacksqwat-o.gif
deleted file mode 100644
index 5c7ce63ed..000000000
Binary files a/chris-farley/matt-foley-jacksqwat-o.gif and /dev/null differ
diff --git a/chris-farley/tommy-boy.gif b/chris-farley/tommy-boy.gif
deleted file mode 100644
index 15c856acc..000000000
Binary files a/chris-farley/tommy-boy.gif and /dev/null differ
diff --git a/chuck-norris/chuck-norris-mario.gif b/chuck-norris/chuck-norris-mario.gif
deleted file mode 100644
index 47848d8d3..000000000
Binary files a/chuck-norris/chuck-norris-mario.gif and /dev/null differ
diff --git a/chuck-norris/chuck-norris-paperball.gif b/chuck-norris/chuck-norris-paperball.gif
deleted file mode 100644
index 122202374..000000000
Binary files a/chuck-norris/chuck-norris-paperball.gif and /dev/null differ
diff --git a/chuck-norris/chuck-norris-split.gif b/chuck-norris/chuck-norris-split.gif
deleted file mode 100644
index 08461790e..000000000
Binary files a/chuck-norris/chuck-norris-split.gif and /dev/null differ
diff --git a/chuck-norris/chuck-norris.gif b/chuck-norris/chuck-norris.gif
deleted file mode 100644
index d9823315c..000000000
Binary files a/chuck-norris/chuck-norris.gif and /dev/null differ
diff --git a/cinemagraphs/dat-kickflip-tho.gif b/cinemagraphs/dat-kickflip-tho.gif
deleted file mode 100644
index 62af0abaf..000000000
Binary files a/cinemagraphs/dat-kickflip-tho.gif and /dev/null differ
diff --git a/cinemagraphs/pour.gif b/cinemagraphs/pour.gif
deleted file mode 100644
index da91987d1..000000000
Binary files a/cinemagraphs/pour.gif and /dev/null differ
diff --git a/clap/conan-clapping.gif b/clap/conan-clapping.gif
deleted file mode 100644
index 0a5b31acc..000000000
Binary files a/clap/conan-clapping.gif and /dev/null differ
diff --git a/classics/bboy-bear.gif b/classics/bboy-bear.gif
deleted file mode 100644
index 20c0f57c5..000000000
Binary files a/classics/bboy-bear.gif and /dev/null differ
diff --git a/epic/cheech-joint.gif b/classics/cheech-joint.gif
similarity index 100%
rename from epic/cheech-joint.gif
rename to classics/cheech-joint.gif
diff --git a/classics/crazy-pills.gif b/classics/crazy-pills.gif
deleted file mode 100644
index 4824f1f59..000000000
Binary files a/classics/crazy-pills.gif and /dev/null differ
diff --git a/classics/dunk-space-jam.gif b/classics/dunk-space-jam.gif
deleted file mode 100644
index 6f5fc1a4e..000000000
Binary files a/classics/dunk-space-jam.gif and /dev/null differ
diff --git a/classics/gandalf-you-shall-not-pass.gif b/classics/gandalf-you-shall-not-pass.gif
deleted file mode 100644
index 624b278dd..000000000
Binary files a/classics/gandalf-you-shall-not-pass.gif and /dev/null differ
diff --git a/classics/getting-paid-2-poop.gif b/classics/getting-paid-2-poop.gif
deleted file mode 100644
index d1e311410..000000000
Binary files a/classics/getting-paid-2-poop.gif and /dev/null differ
diff --git a/classics/good-point.gif b/classics/good-point.gif
deleted file mode 100644
index 434c9d0e6..000000000
Binary files a/classics/good-point.gif and /dev/null differ
diff --git a/classics/grease-bit-burger.gif b/classics/grease-bit-burger.gif
deleted file mode 100644
index 6d64346c6..000000000
Binary files a/classics/grease-bit-burger.gif and /dev/null differ
diff --git a/classics/happy-gilmore-hips.gif b/classics/happy-gilmore-hips.gif
deleted file mode 100644
index 1331fa5dc..000000000
Binary files a/classics/happy-gilmore-hips.gif and /dev/null differ
diff --git a/classics/macgyver.gif b/classics/macgyver.gif
deleted file mode 100644
index 9b7e64f0a..000000000
Binary files a/classics/macgyver.gif and /dev/null differ
diff --git a/epic/yak-shave.gif b/classics/yak-shave.gif
similarity index 100%
rename from epic/yak-shave.gif
rename to classics/yak-shave.gif
diff --git a/chris-farley/farley-weekend-update.gif b/contempt/farley-weekend-update.gif
similarity index 100%
rename from chris-farley/farley-weekend-update.gif
rename to contempt/farley-weekend-update.gif
diff --git a/contempt/fresh-prince-omg.gif b/contempt/fresh-prince-omg.gif
deleted file mode 100644
index d23d5ebf5..000000000
Binary files a/contempt/fresh-prince-omg.gif and /dev/null differ
diff --git a/cream/baby-throws-money.gif b/cream/baby-throws-money.gif
deleted file mode 100644
index b207c3ed2..000000000
Binary files a/cream/baby-throws-money.gif and /dev/null differ
diff --git a/crying/obama-crying.gif b/crying/obama-crying.gif
deleted file mode 100644
index 9a2dcd295..000000000
Binary files a/crying/obama-crying.gif and /dev/null differ
diff --git a/cinemagraphs/raining.gif b/crying/raining.gif
similarity index 100%
rename from cinemagraphs/raining.gif
rename to crying/raining.gif
diff --git a/excited/Blues-Brothers.gif b/dancing/Blues-Brothers.gif
similarity index 100%
rename from excited/Blues-Brothers.gif
rename to dancing/Blues-Brothers.gif
diff --git a/excited/ace-ventura-dance.gif b/dancing/ace-ventura-dance.gif
similarity index 100%
rename from excited/ace-ventura-dance.gif
rename to dancing/ace-ventura-dance.gif
diff --git a/dancing/advance-break-dans.gif b/dancing/advance-break-dans.gif
deleted file mode 100644
index 471b4d490..000000000
Binary files a/dancing/advance-break-dans.gif and /dev/null differ
diff --git a/dancing/blues-clues-dance.gif b/dancing/blues-clues-dance.gif
deleted file mode 100644
index 7943b16d3..000000000
Binary files a/dancing/blues-clues-dance.gif and /dev/null differ
diff --git a/epic/calvin-hobbes-dance.gif b/dancing/calvin-hobbes-dance.gif
similarity index 100%
rename from epic/calvin-hobbes-dance.gif
rename to dancing/calvin-hobbes-dance.gif
diff --git a/fresh-prince/carlton.gif b/dancing/carlton.gif
similarity index 100%
rename from fresh-prince/carlton.gif
rename to dancing/carlton.gif
diff --git a/dancing/creeper-dancer.gif b/dancing/creeper-dancer.gif
deleted file mode 100644
index 757035a17..000000000
Binary files a/dancing/creeper-dancer.gif and /dev/null differ
diff --git a/dancing/dancin-wit-godzilla.gif b/dancing/dancin-wit-godzilla.gif
deleted file mode 100644
index eda6e668a..000000000
Binary files a/dancing/dancin-wit-godzilla.gif and /dev/null differ
diff --git a/excited/happy-dance-forever.gif b/dancing/happy-dance-forever.gif
similarity index 100%
rename from excited/happy-dance-forever.gif
rename to dancing/happy-dance-forever.gif
diff --git a/dancing/stomrtroopin2.gif b/dancing/stomrtroopin2.gif
deleted file mode 100644
index 7372f460c..000000000
Binary files a/dancing/stomrtroopin2.gif and /dev/null differ
diff --git a/dancing/stuffed-animal-dance.gif b/dancing/stuffed-animal-dance.gif
deleted file mode 100644
index 388c7016f..000000000
Binary files a/dancing/stuffed-animal-dance.gif and /dev/null differ
diff --git a/epic/techno-viking.gif b/dancing/techno-viking.gif
similarity index 100%
rename from epic/techno-viking.gif
rename to dancing/techno-viking.gif
diff --git a/deal-with-it/advance-skate.gif b/deal-with-it/advance-skate.gif
deleted file mode 100644
index 8a4c787ff..000000000
Binary files a/deal-with-it/advance-skate.gif and /dev/null differ
diff --git a/deal-with-it/money-baller.gif b/deal-with-it/money-baller.gif
deleted file mode 100644
index 340ab24c3..000000000
Binary files a/deal-with-it/money-baller.gif and /dev/null differ
diff --git a/disgust/lion-king-confused-huh.gif b/disgust/lion-king-confused-huh.gif
deleted file mode 100644
index 178c99d17..000000000
Binary files a/disgust/lion-king-confused-huh.gif and /dev/null differ
diff --git a/doge/doge-work.gif b/doge/doge-work.gif
deleted file mode 100644
index ca088ea40..000000000
Binary files a/doge/doge-work.gif and /dev/null differ
diff --git a/doge/doge.gif b/doge/doge.gif
deleted file mode 100644
index 20429e6ed..000000000
Binary files a/doge/doge.gif and /dev/null differ
diff --git a/doge/such-logo.gif b/doge/such-logo.gif
deleted file mode 100644
index 07fb2f8db..000000000
Binary files a/doge/such-logo.gif and /dev/null differ
diff --git a/downton-abbey/oh-please.gif b/downton-abbey/oh-please.gif
deleted file mode 100644
index 858ddff0e..000000000
Binary files a/downton-abbey/oh-please.gif and /dev/null differ
diff --git a/downton-abbey/violet-ringing-bell.gif b/downton-abbey/violet-ringing-bell.gif
deleted file mode 100644
index c74e74a5b..000000000
Binary files a/downton-abbey/violet-ringing-bell.gif and /dev/null differ
diff --git a/downton-abbey/violet-woman-contrary.gif b/downton-abbey/violet-woman-contrary.gif
deleted file mode 100644
index 7f34f10f4..000000000
Binary files a/downton-abbey/violet-woman-contrary.gif and /dev/null differ
diff --git a/eddie-izzard/eddie-izzard-shaking-head.gif b/eddie-izzard/eddie-izzard-shaking-head.gif
deleted file mode 100644
index e57482d36..000000000
Binary files a/eddie-izzard/eddie-izzard-shaking-head.gif and /dev/null differ
diff --git a/eddie-izzard/eddie-izzard-sissy-face.gif b/eddie-izzard/eddie-izzard-sissy-face.gif
deleted file mode 100644
index 554af89c5..000000000
Binary files a/eddie-izzard/eddie-izzard-sissy-face.gif and /dev/null differ
diff --git a/eddie-izzard/fingers-in-ears.gif b/eddie-izzard/not-listening.gif
similarity index 100%
rename from eddie-izzard/fingers-in-ears.gif
rename to eddie-izzard/not-listening.gif
diff --git a/epic/beard-slap.gif b/epic/beard-slap.gif
deleted file mode 100644
index 46e8c8832..000000000
Binary files a/epic/beard-slap.gif and /dev/null differ
diff --git a/epic/bulldozer.gif b/epic/bulldozer.gif
deleted file mode 100644
index b0ef2d3f9..000000000
Binary files a/epic/bulldozer.gif and /dev/null differ
diff --git a/epic/expedition.gif b/epic/expedition.gif
deleted file mode 100644
index 5c5f002d4..000000000
Binary files a/epic/expedition.gif and /dev/null differ
diff --git a/epic/stickman-adventure.gif b/epic/stickman-adventure.gif
deleted file mode 100644
index 789d507b6..000000000
Binary files a/epic/stickman-adventure.gif and /dev/null differ
diff --git a/epic/superhero.gif b/epic/superhero.gif
deleted file mode 100644
index 0db4599f9..000000000
Binary files a/epic/superhero.gif and /dev/null differ
diff --git a/epic/supersnail.gif b/epic/supersnail.gif
deleted file mode 100644
index 61c6f0854..000000000
Binary files a/epic/supersnail.gif and /dev/null differ
diff --git a/excited/1-50-Cent-Laugh-Off-JAG.gif b/excited/1-50-Cent-Laugh-Off-JAG.gif
deleted file mode 100644
index 8fbf25b84..000000000
Binary files a/excited/1-50-Cent-Laugh-Off-JAG.gif and /dev/null differ
diff --git a/excited/46-Ross-Boom.gif b/excited/46-Ross-Boom.gif
deleted file mode 100644
index 0f505ddeb..000000000
Binary files a/excited/46-Ross-Boom.gif and /dev/null differ
diff --git a/excited/bboy-bear.gif b/excited/bboy-bear.gif
deleted file mode 100644
index 20c0f57c5..000000000
Binary files a/excited/bboy-bear.gif and /dev/null differ
diff --git a/excited/dancin.gif b/excited/dancin.gif
deleted file mode 100644
index 4239206f1..000000000
Binary files a/excited/dancin.gif and /dev/null differ
diff --git a/excited/dinosaur-hands.gif b/excited/dinosaur-hands.gif
deleted file mode 100644
index 18ebc2cb1..000000000
Binary files a/excited/dinosaur-hands.gif and /dev/null differ
diff --git a/excited/fresh-prince-omg.gif b/excited/fresh-prince-omg.gif
deleted file mode 100644
index d23d5ebf5..000000000
Binary files a/excited/fresh-prince-omg.gif and /dev/null differ
diff --git a/excited/get-out.gif b/excited/get-out.gif
deleted file mode 100644
index dd6875ded..000000000
Binary files a/excited/get-out.gif and /dev/null differ
diff --git a/excited/giphy.gif b/excited/giphy.gif
deleted file mode 100644
index e4ec575eb..000000000
Binary files a/excited/giphy.gif and /dev/null differ
diff --git a/chris-farley/matt-foley-1.gif b/excited/matt-foley-1.gif
similarity index 100%
rename from chris-farley/matt-foley-1.gif
rename to excited/matt-foley-1.gif
diff --git a/excited/thumbs-up-levar-burton.gif b/excited/thumbs-up-levar-burton.gif
deleted file mode 100644
index f5ddaab2c..000000000
Binary files a/excited/thumbs-up-levar-burton.gif and /dev/null differ
diff --git a/excited/thumbs-up.gif b/excited/thumbs-up.gif
deleted file mode 100644
index cf951b304..000000000
Binary files a/excited/thumbs-up.gif and /dev/null differ
diff --git a/excited/wooo.gif b/excited/wooo.gif
deleted file mode 100644
index becd67320..000000000
Binary files a/excited/wooo.gif and /dev/null differ
diff --git a/faceplants/headshot-bball.gif b/faceplants/headshot-bball.gif
deleted file mode 100644
index 9407e7268..000000000
Binary files a/faceplants/headshot-bball.gif and /dev/null differ
diff --git a/faceplants/mascot-spill.gif b/faceplants/mascot-spill.gif
deleted file mode 100644
index 0905d7786..000000000
Binary files a/faceplants/mascot-spill.gif and /dev/null differ
diff --git a/fail/catapult-accident.gif b/fail/catapult-accident.gif
deleted file mode 100644
index 2669677dc..000000000
Binary files a/fail/catapult-accident.gif and /dev/null differ
diff --git a/fail/coke-bottle-fail.gif b/fail/coke-bottle-fail.gif
deleted file mode 100644
index 41c21d37e..000000000
Binary files a/fail/coke-bottle-fail.gif and /dev/null differ
diff --git a/fail/drop-kick.gif b/fail/drop-kick.gif
deleted file mode 100644
index 61b59d494..000000000
Binary files a/fail/drop-kick.gif and /dev/null differ
diff --git a/fail/fail-ant-spider.gif b/fail/fail-ant-spider.gif
deleted file mode 100644
index 19b026327..000000000
Binary files a/fail/fail-ant-spider.gif and /dev/null differ
diff --git a/fail/falling-pandas.gif b/fail/falling-pandas.gif
deleted file mode 100644
index 458e50aa3..000000000
Binary files a/fail/falling-pandas.gif and /dev/null differ
diff --git a/fail/horse-fence-fail.gif b/fail/horse-fence-fail.gif
deleted file mode 100644
index 6683b89e1..000000000
Binary files a/fail/horse-fence-fail.gif and /dev/null differ
diff --git a/fail/jedi-dog.gif b/fail/jedi-dog.gif
deleted file mode 100644
index 400507b3d..000000000
Binary files a/fail/jedi-dog.gif and /dev/null differ
diff --git a/fail/lifting-flip.gif b/fail/lifting-flip.gif
deleted file mode 100644
index 845d3bdd2..000000000
Binary files a/fail/lifting-flip.gif and /dev/null differ
diff --git a/fail/toilet-fail.gif b/fail/toilet-fail.gif
deleted file mode 100644
index 012f3561e..000000000
Binary files a/fail/toilet-fail.gif and /dev/null differ
diff --git a/fail/wrong-tool.gif b/fail/wrong-tool.gif
deleted file mode 100644
index b3877594b..000000000
Binary files a/fail/wrong-tool.gif and /dev/null differ
diff --git a/fresh-prince/fresh-prince-dance.gif b/fresh-prince/fresh-prince-dance.gif
deleted file mode 100644
index b460da771..000000000
Binary files a/fresh-prince/fresh-prince-dance.gif and /dev/null differ
diff --git a/fresh-prince/fresh-prince-omg.gif b/fresh-prince/fresh-prince-omg.gif
deleted file mode 100644
index d23d5ebf5..000000000
Binary files a/fresh-prince/fresh-prince-omg.gif and /dev/null differ
diff --git a/fresh-prince/fresh-prince-oooh.gif b/fresh-prince/fresh-prince-oooh.gif
deleted file mode 100644
index 7d4d683cd..000000000
Binary files a/fresh-prince/fresh-prince-oooh.gif and /dev/null differ
diff --git a/frustrated/fresh-prince-omg.gif b/frustrated/fresh-prince-omg.gif
deleted file mode 100644
index d23d5ebf5..000000000
Binary files a/frustrated/fresh-prince-omg.gif and /dev/null differ
diff --git a/fu/batman.gif b/fu/batman.gif
deleted file mode 100644
index cc64f1320..000000000
Binary files a/fu/batman.gif and /dev/null differ
diff --git a/fu/enough-internet.gif b/fu/enough-internet.gif
deleted file mode 100644
index a2252b127..000000000
Binary files a/fu/enough-internet.gif and /dev/null differ
diff --git a/fu/get-the-eff-out.gif b/fu/get-the-eff-out.gif
deleted file mode 100644
index 10bbc9931..000000000
Binary files a/fu/get-the-eff-out.gif and /dev/null differ
diff --git a/fu/mr-chow-haha.gif b/fu/mr-chow-haha.gif
deleted file mode 100644
index e4cb0805c..000000000
Binary files a/fu/mr-chow-haha.gif and /dev/null differ
diff --git a/fu/office.gif b/fu/office.gif
deleted file mode 100644
index c3f3c75f3..000000000
Binary files a/fu/office.gif and /dev/null differ
diff --git a/gangsta/1-50-Cent-Laugh-Off-JAG.gif b/gangsta/1-50-Cent-Laugh-Off-JAG.gif
deleted file mode 100644
index 8fbf25b84..000000000
Binary files a/gangsta/1-50-Cent-Laugh-Off-JAG.gif and /dev/null differ
diff --git a/frustrated/george-costanza.gif b/george-costanza.gif
similarity index 100%
rename from frustrated/george-costanza.gif
rename to george-costanza.gif
diff --git a/giveafck/i-dont-give-a-fuck-boba-fett-gif.gif b/giveafck/i-dont-give-a-fuck-boba-fett-gif.gif
deleted file mode 100644
index 2e6f5ad35..000000000
Binary files a/giveafck/i-dont-give-a-fuck-boba-fett-gif.gif and /dev/null differ
diff --git a/giveafck/i-dont-give-a-fuck-pocahontas-gif.gif b/giveafck/i-dont-give-a-fuck-pocahontas-gif.gif
deleted file mode 100644
index a8c287433..000000000
Binary files a/giveafck/i-dont-give-a-fuck-pocahontas-gif.gif and /dev/null differ
diff --git a/giveafck/whoa-i-almost-gave-a-fuck-gif.gif b/giveafck/whoa-i-almost-gave-a-fuck-gif.gif
deleted file mode 100644
index 904583dcc..000000000
Binary files a/giveafck/whoa-i-almost-gave-a-fuck-gif.gif and /dev/null differ
diff --git a/gordon-ramsay/are-you-stupid.gif b/gordon-ramsay/are-you-stupid.gif
deleted file mode 100644
index fb7295d96..000000000
Binary files a/gordon-ramsay/are-you-stupid.gif and /dev/null differ
diff --git a/gordon-ramsay/creepy-gordon.gif b/gordon-ramsay/creepy-gordon.gif
deleted file mode 100644
index 09dc83145..000000000
Binary files a/gordon-ramsay/creepy-gordon.gif and /dev/null differ
diff --git a/gordon-ramsay/do-you-want-a-fucking-medal.gif b/gordon-ramsay/do-you-want-a-fucking-medal.gif
deleted file mode 100644
index 36c2fba15..000000000
Binary files a/gordon-ramsay/do-you-want-a-fucking-medal.gif and /dev/null differ
diff --git a/gordon-ramsay/fuck-off-1.gif b/gordon-ramsay/fuck-off-1.gif
deleted file mode 100644
index 4d76113fc..000000000
Binary files a/gordon-ramsay/fuck-off-1.gif and /dev/null differ
diff --git a/gordon-ramsay/fuck-off-2.gif b/gordon-ramsay/fuck-off-2.gif
deleted file mode 100644
index 955e48b16..000000000
Binary files a/gordon-ramsay/fuck-off-2.gif and /dev/null differ
diff --git a/gordon-ramsay/fuck-off-3.gif b/gordon-ramsay/fuck-off-3.gif
deleted file mode 100644
index 922c8fe6e..000000000
Binary files a/gordon-ramsay/fuck-off-3.gif and /dev/null differ
diff --git a/gordon-ramsay/fuck.gif b/gordon-ramsay/fuck.gif
deleted file mode 100644
index cbb62282f..000000000
Binary files a/gordon-ramsay/fuck.gif and /dev/null differ
diff --git a/gordon-ramsay/mad.gif b/gordon-ramsay/mad.gif
deleted file mode 100644
index 9f717cbff..000000000
Binary files a/gordon-ramsay/mad.gif and /dev/null differ
diff --git a/gordon-ramsay/oh-my-god.gif b/gordon-ramsay/oh-my-god.gif
deleted file mode 100644
index 07d9e99ab..000000000
Binary files a/gordon-ramsay/oh-my-god.gif and /dev/null differ
diff --git a/gordon-ramsay/outta-here.gif b/gordon-ramsay/outta-here.gif
deleted file mode 100644
index 412bc3f78..000000000
Binary files a/gordon-ramsay/outta-here.gif and /dev/null differ
diff --git a/gordon-ramsay/piss-off-2.gif b/gordon-ramsay/piss-off-2.gif
deleted file mode 100644
index 31d3a757c..000000000
Binary files a/gordon-ramsay/piss-off-2.gif and /dev/null differ
diff --git a/gordon-ramsay/shut-the-fuck-up.gif b/gordon-ramsay/shut-the-fuck-up.gif
deleted file mode 100644
index f5aaf0e39..000000000
Binary files a/gordon-ramsay/shut-the-fuck-up.gif and /dev/null differ
diff --git a/gordon-ramsay/stop-everything.gif b/gordon-ramsay/stop-everything.gif
deleted file mode 100644
index 630364eb4..000000000
Binary files a/gordon-ramsay/stop-everything.gif and /dev/null differ
diff --git a/gordon-ramsay/stuck-up-precious-little-bitch.gif b/gordon-ramsay/stuck-up-precious-little-bitch.gif
deleted file mode 100644
index 8abb0b00f..000000000
Binary files a/gordon-ramsay/stuck-up-precious-little-bitch.gif and /dev/null differ
diff --git a/gordon-ramsay/unbelievable.gif b/gordon-ramsay/unbelievable.gif
deleted file mode 100644
index a1cfd9bca..000000000
Binary files a/gordon-ramsay/unbelievable.gif and /dev/null differ
diff --git a/gordon-ramsay/you-fucking-donkey.gif b/gordon-ramsay/you-fucking-donkey.gif
deleted file mode 100644
index a1a028d67..000000000
Binary files a/gordon-ramsay/you-fucking-donkey.gif and /dev/null differ
diff --git a/gtfo/inapropro-kiss.gif b/gtfo/inapropro-kiss.gif
deleted file mode 100644
index d1d9b4474..000000000
Binary files a/gtfo/inapropro-kiss.gif and /dev/null differ
diff --git a/hacking/jim-carrey.gif b/hacking/typity-type.gif
similarity index 100%
rename from hacking/jim-carrey.gif
rename to hacking/typity-type.gif
diff --git a/gordon-ramsay/piss-off-1.gif b/hand-wave/piss-off-1.gif
similarity index 100%
rename from gordon-ramsay/piss-off-1.gif
rename to hand-wave/piss-off-1.gif
diff --git a/haters-gonna-hate/haters-gon-hate.jpg b/haters-gonna-hate/haters-gon-hate.jpg
deleted file mode 100644
index bf8fa7a0c..000000000
Binary files a/haters-gonna-hate/haters-gon-hate.jpg and /dev/null differ
diff --git a/haters-gonna-hate/haters1.gif b/haters-gonna-hate/haters1.gif
deleted file mode 100644
index 08ec21b9f..000000000
Binary files a/haters-gonna-hate/haters1.gif and /dev/null differ
diff --git a/haters-gonna-hate/lizard-machine.gif b/haters-gonna-hate/lizard-machine.gif
deleted file mode 100644
index 629a064cd..000000000
Binary files a/haters-gonna-hate/lizard-machine.gif and /dev/null differ
diff --git a/haters-gonna-hate/moonwalking-minihorse.gif b/haters-gonna-hate/moonwalking-minihorse.gif
deleted file mode 100644
index 0ac4ddd01..000000000
Binary files a/haters-gonna-hate/moonwalking-minihorse.gif and /dev/null differ
diff --git a/headbang/beavis-butthead-headbang.gif b/headbang/beavis-butthead-headbang.gif
deleted file mode 100644
index 0953f1e4d..000000000
Binary files a/headbang/beavis-butthead-headbang.gif and /dev/null differ
diff --git a/headbang/talkshow-headbang.gif b/headbang/talkshow-headbang.gif
deleted file mode 100644
index 5a7e927d7..000000000
Binary files a/headbang/talkshow-headbang.gif and /dev/null differ
diff --git a/hiding/hiding.gif b/hiding/hiding.gif
deleted file mode 100644
index e53815a5f..000000000
Binary files a/hiding/hiding.gif and /dev/null differ
diff --git a/high-five/borat-high-five-2.gif b/high-five/borat-high-five-2.gif
deleted file mode 100644
index 5930db39f..000000000
Binary files a/high-five/borat-high-five-2.gif and /dev/null differ
diff --git a/high-five/disney-animated-high-five.gif b/high-five/disney-animated-high-five.gif
deleted file mode 100644
index 969f37304..000000000
Binary files a/high-five/disney-animated-high-five.gif and /dev/null differ
diff --git a/high-five/dog-high-five.gif b/high-five/dog-high-five.gif
deleted file mode 100644
index 908626a6e..000000000
Binary files a/high-five/dog-high-five.gif and /dev/null differ
diff --git a/high-five/endzone-highfive.gif b/high-five/endzone-highfive.gif
deleted file mode 100644
index 6b398a160..000000000
Binary files a/high-five/endzone-highfive.gif and /dev/null differ
diff --git a/high-five/kimmel-gosling-high-five.gif b/high-five/kimmel-gosling-high-five.gif
deleted file mode 100644
index 1acbf3d8a..000000000
Binary files a/high-five/kimmel-gosling-high-five.gif and /dev/null differ
diff --git a/high-five/pokemon-high-five.gif b/high-five/pokemon-high-five.gif
deleted file mode 100644
index 6681878af..000000000
Binary files a/high-five/pokemon-high-five.gif and /dev/null differ
diff --git a/high-five/tina-fey-high-five-self.gif b/high-five/tina-fey-high-five-self.gif
deleted file mode 100644
index e2ff6b35d..000000000
Binary files a/high-five/tina-fey-high-five-self.gif and /dev/null differ
diff --git a/hubbers/defunkt-rtomayko-chuckle.gif b/hubbers/defunkt-rtomayko-chuckle.gif
deleted file mode 100644
index ce687495b..000000000
Binary files a/hubbers/defunkt-rtomayko-chuckle.gif and /dev/null differ
diff --git a/hubbers/eww.gif b/hubbers/eww.gif
deleted file mode 100644
index ccf44b03e..000000000
Binary files a/hubbers/eww.gif and /dev/null differ
diff --git a/hubbers/hubmojis-bhuga-laughing.gif b/hubbers/hubmojis-bhuga-laughing.gif
deleted file mode 100644
index 712c77243..000000000
Binary files a/hubbers/hubmojis-bhuga-laughing.gif and /dev/null differ
diff --git a/hubbers/hubmojis-furyus-angry.gif b/hubbers/hubmojis-furyus-angry.gif
deleted file mode 100644
index 609de1c4d..000000000
Binary files a/hubbers/hubmojis-furyus-angry.gif and /dev/null differ
diff --git a/hubbers/hubmojis-furyus-wink.gif b/hubbers/hubmojis-furyus-wink.gif
deleted file mode 100644
index 0b0e85e77..000000000
Binary files a/hubbers/hubmojis-furyus-wink.gif and /dev/null differ
diff --git a/hubbers/sonya-spin.gif b/hubbers/sonya-spin.gif
deleted file mode 100644
index c552b7f4e..000000000
Binary files a/hubbers/sonya-spin.gif and /dev/null differ
diff --git a/jpg/cannot_be_unseen.jpg b/jpg/cannot_be_unseen.jpg
deleted file mode 100644
index 6e4069b19..000000000
Binary files a/jpg/cannot_be_unseen.jpg and /dev/null differ
diff --git a/jpg/open-socket.jpg b/jpg/open-socket.jpg
deleted file mode 100644
index 2b835a3f3..000000000
Binary files a/jpg/open-socket.jpg and /dev/null differ
diff --git a/jurassic-park/cat-scare.gif b/jurassic-park/cat-scare.gif
deleted file mode 100644
index 300d923a6..000000000
Binary files a/jurassic-park/cat-scare.gif and /dev/null differ
diff --git a/jurassic-park/clever-girl-2.gif b/jurassic-park/clever-girl-2.gif
deleted file mode 100644
index 98b15e343..000000000
Binary files a/jurassic-park/clever-girl-2.gif and /dev/null differ
diff --git a/jurassic-park/clever-girl.gif b/jurassic-park/clever-girl.gif
deleted file mode 100644
index e2227f091..000000000
Binary files a/jurassic-park/clever-girl.gif and /dev/null differ
diff --git a/jurassic-park/jurassic-twerk.gif b/jurassic-park/jurassic-twerk.gif
deleted file mode 100644
index 2d44b2b75..000000000
Binary files a/jurassic-park/jurassic-twerk.gif and /dev/null differ
diff --git a/jurassic-park/raptor-breath.gif b/jurassic-park/raptor-breath.gif
deleted file mode 100644
index a9c040260..000000000
Binary files a/jurassic-park/raptor-breath.gif and /dev/null differ
diff --git a/jurassic-park/silly-trex-guy.gif b/jurassic-park/silly-trex-guy.gif
deleted file mode 100644
index ad87733f4..000000000
Binary files a/jurassic-park/silly-trex-guy.gif and /dev/null differ
diff --git a/jurassic-park/trex-3d.gif b/jurassic-park/trex-3d.gif
deleted file mode 100644
index b2e59898e..000000000
Binary files a/jurassic-park/trex-3d.gif and /dev/null differ
diff --git a/lol/44-KRS-One-LOL.gif b/lol/44-KRS-One-LOL.gif
deleted file mode 100644
index 74acc19ec..000000000
Binary files a/lol/44-KRS-One-LOL.gif and /dev/null differ
diff --git a/lolwat/werkin-out.gif b/lolwat/werkin-out.gif
deleted file mode 100644
index 2d497c1c7..000000000
Binary files a/lolwat/werkin-out.gif and /dev/null differ
diff --git a/lolwat/yes-fight-fight.gif b/lolwat/yes-fight-fight.gif
deleted file mode 100644
index bedfb8739..000000000
Binary files a/lolwat/yes-fight-fight.gif and /dev/null differ
diff --git a/austin-powers/austin-powers-omg.gif b/omg/austin-powers-omg.gif
similarity index 100%
rename from austin-powers/austin-powers-omg.gif
rename to omg/austin-powers-omg.gif
diff --git a/omg/camouflage-bboy.gif b/omg/camouflage-bboy.gif
deleted file mode 100644
index 5377e7ad8..000000000
Binary files a/omg/camouflage-bboy.gif and /dev/null differ
diff --git a/chris-farley/billy-madison.gif b/upset/billy-madison.gif
similarity index 100%
rename from chris-farley/billy-madison.gif
rename to upset/billy-madison.gif
diff --git a/chuck-norris/chuck-norris-punch.gif b/upset/chuck-norris-punch.gif
similarity index 100%
rename from chuck-norris/chuck-norris-punch.gif
rename to upset/chuck-norris-punch.gif