Moved some stuff around to clean up the main project folder