Modified project structure

Also completed more unittests