Code refactored and cleaned up
Updated versioning scheme
Misc fixes, additions and changes