Organizando arquivos
Code reorganization proposed by André Rodrigues