Switched layout to common way. Now source is below source and tests are below test
Adapted files to new filessystem structure