RFC: enforce module directory structure more strictly