more moving of dependencies to simplied cjs wraper
more moving depencies to cjs simplied wrapper and a bit of refactoring
finishing moving dependencies to cjs simplified wrapper - also a bit of refactoring