reorder and rename so it is easy to submodule