Renamed files and packages
Merge pull request #4 from alirezatr/refactor

Renamed files and packages