Moved more files round so module worked