New project structure and added NUnit