Fixed maven compiler configuration
Major fix/refactoring