Classpath refine changes
Layout work continues.