Added Unittests. Fixed project structure