Cleaned up the solution and projects a bit... renaming namespeaces, etc
Removed/relocated files