Restructuring classpath