Restructured repo some more.