Moved files into new folders

- Laid out the project so that it makes more sense