restructure according to dropwizard recommended structure