Refactored Names and made the project more portable
Merge pull request #7 from otherside94/refactoring

Refactored Names and made the project more portable