Issue 23 - Change the java Main class' class names.