Moving files to where they belong!
Merge pull request #14 from renatooliveira/master

Moving files to where they belong!

-
Things related to the issue #10