Upgrade to root folder compiling
version bump
Renames and fixes