Created sub-packages and moved class files into appropriate
sub-packages.