Added lots of submodules, updated aliases