Moved around files to apprpriate places, mirroring project settings.