Split out methods into separate sub-modules