Closing current branch.
Merge pull request #2 from AhmedAtef07/Refactoring-Redesigning

Closing current branch.