Create packages 'service' and 'model' (and move classes in these packages)
Replace fest-assert by assertj in JUnit tests