fixing file structure thanks to sublime keeping deleted files open
commented other features cause they break our tests