improve repo arrangement