Got rid of some compiler warnings.
Also moved a class from one package to another