Reorganize
Removed unused files