Switching to submodule for use-packge.