Updated NUnit. Reorganized solution structure