Got rid of submodules
Removed submodules
Added libraries