move to mvn tree format, add testing
minor updates