Reorganizing folders

Moving stuff around. Stuff will probably break because of it.