Changed the classpath to behave properly with the new directory structure.