Refactoring para organizar melhor as coisas

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