Fixed StyleCop and Code Analysis issues
Minor refactoring
Moved infrastructure classes