Repository restructure