Reorganizing files
Reorganizing files part two: Electric Boogaloo

Because GitHub doesn't seem to like git mv