Added submodules for completion and highlighting

This pull request is to fix issue #12 as currently the submodules are orphaned