Modified module directory structure