Classpath updates and refactoring.