Reorganizing code to match the project layout of my other projects