Removed old modules
Added additional check
Versioning update
Build