Added apache lang3 dependency, pom refactor