Merge pull request #2 from stomppah/master

Hopefully sorted the issue out - this includes a number of layout suggestions by StyleCop (using directives within namespace etc...)
Initial work on testing new entity system
Folder structure change for tests
fixed crash