general code organization improvements
Merge pull request #6 from wilkerlucio/wilker/code_organization

general code organization improvements