Minor refactoring
Prepare for maven release 0.1.0