repo restructure