Relocated some classes to different packages

Signed-off-by: Daniel Pierce <paladin2350@gmail.com>