Redo repo structure 6/19