started refactoring to dropwizard