cleaning up file structure