Update classpath to try and reduce crash on launch after previous crash.

Organize imports.