move a class and also moved the at

Signed-off-by: Cayde Dixon <cayde.dixon@gmail.com>