Nwe Folder Organization

Grouped related classes into logical folders.