adding all the missing things before switching to submodule