Revert addition of subproject to main repo dir

This reverts commit 50b33ace865d815920276c99c355bc3195e4beb4.