Code refactor, version file can be package.json, code optimizations