Revert "Classpath removed"

This reverts commit 6c9a51d1e165e8ac99fc7048abd3451fd69e82ac.