removing bundled stuff to replace with submodules
Add things back as submodules