CLSN-1941 Structure wise folders