Reorganize module directory