put in shorter module names; reorganize the modules for a more logical layout