change files and clean up unused files