[Master] Restructured repo