Simplifying the require calls

Getting rid of the exports.ModuleName
syntax, which is an artifact from a time
where circular dependencies existed in the lib
Resolving conflicts