Removed unused files
Removed windwows path separators and some refactoring