Changed path structure to avoid accidental imports and allow for misc shared submodules in future