Move supporting code to module directory