Simpler code layout
Correct versioning scheme
Add files part of new refactor
Fix merge conflicts