Revert "classpath fixes"

This reverts commit c333b073f8c79cdbfc6dd8cb1ba34db7e766aa92.
pulling in main class from Dan