removed unused files and reorganized