Update version number
Complete refactor and build support