Fixes
Remove libs and add them again...
Add submodules again