refactoring completo, alpha 1
Merge pull request #1 from marcelom/refactoring

refactoring completo, alpha 1