Moved classes to different packages

Signed-off-by: Exikle <dixondcunha@hotmail.com>