* changes to pass tests on windows
- cleanup of old files
* refactor