Refactoring to match Dropwizard layout recommendation
Fixes #2

Change-Id: Id2f682057e6f2f95f9c321c0978900d8efbec446