Organize files:
- removed old unused files
- fixes placement for new files
- added some folders