consolidating some classes and generic code cleaning.
Adding placeholder for PvP page.
Merge pull request #30 from pjbehr87/dev

Code cleanup and Adding placeholder for PvP page.