Moved some stuff into different folders

To tidy up the repository