Re-structured classpath