Trying to get rid of sub-modules