Added some directory aliases
Submodules updated