Code refactoring + new way to handle dependencies (maven repositories..)