Applying new directory structure
Merge pull request #1 from msfernandes/master

Applying new directory structure