cleaning up file hierarchy