refactored remaining dependencies to maven