Sorted classes into packages to make the project more organised.
Updated affected code.