Moved extensions to more visible namespaces. Formatting fixes. Rebase to
latest changes on dev.