Added more directory structure
Merge pull request #4 from filipefmelo/master

Merge pull request #3 from filipefmelo/development
Merge pull request #5 from filipefmelo/development

Merging all the changes into branch