Java convention violated #667

Although having multiple classes inside one file works, it is often against the convention to do so. It would be better to have two separate files named after their purposes, which would make a lot more sense and enhance readability.