Fixed small issues with file placement in project and code reformatting