Cleaning up file structure.