Moving stuff because I'm going insane with everything in one big
directory.