(*) Project structure improvements with nested files