cleaning up and moving more files