[SPACE][#] Restructured folders