reorganized project, removed old files