cleanup unused files, rename dirs