reorganized directories and module names