Changing directory structure
Removed unused files
Fixed merge issues