Resolved the most important JAR conflicts and did some refactoring