Moved some stuff around

Cleaned up the folders and edited files.