Reworked module directory structure.