cleaning up file structure.