repo re-structure