Merge
Update git structure and version bump