Refactored module
Refactored tests
Versioning
Build