Refactoring and code cleanup. Changing layout.
Merge pull request #10 from pedroigor/master

Refactoring and code cleanup. Changing layout.