Organise classes
Add NUnit config