moved files and cleaned up locations