Restructured repo folder layout