Minor fix - classes were overwritten (messed up Eclipse)