Rm project file
Refactor and unit tests
Bumped version