cleaned up file structure and removed old files