trying to fix all the things
trying to merge updated directories
removed submodules ... i think