Moved around files in file structure.