Fixed up project structure, a few files were in an odd place