Work on Classpath extraction, reformatting.