reverted to non-submodule setup