Re-arrange repository