Updating package structure to have submodules