Various changes

Change name of class,
Create new class
Check comments and format of Java code
Customise imports