Fix classpath directory, remove unnecessary one