Changed structure of code base

Renamed some variables and methods. Also re-ordered structure of .cs
files.
Merge pull request #1 from Architect-1/Refactoring

Changed structure of code base