Imported correct classes

YES! All errors have been dealt with.