Adding submodules (reverted from commit 72e3b58f42bec6f21643e26a2e37e2c31ef284ab)