imports. moving around
maven style directory layout. 'tests' don't work. Have to write anew
Merge remote-tracking branch 'origin/master'