[NTG-context] project structure simplification ?