Separando classes

Signed-off-by: Moacir de Oliveira <moacirdeoliveira.eng@gmail.com>