Marked classes internal
Changes to projects to make them work in Visual Studio 2012