Cleaning file structure up