Rearranged structure according to dropwizard's "best practices"