Restructured repo some more