Refactor files
Merge pull request #2 from fab48/master

Refactor move files to src directory
Merge pull request #3 from fab48/woakas/refactor_branch

Woakas/refactor branch