Re-implement limited module namespacing

Add modules back in to main class & version classfile
just for options, constants, and static methods.