Simplify module directory structure