First attempt at refactor to work with maven setup