begin separation of module directory structure