New folder structure and unit testing
Unit testing files
Merge from test to master