Directory organization issues resolved
Merge pull request #9 from filipealva/directories-fixes

Directory organization issues resolved