Deleting Singletons

Making an effort to par down excess stuff and most importantly removed
the Singleton class completely. Surgery was quite invasive but the end
result isn't to terrible at all, good evidence that the pattern wasn't
actually needed at all.
Updated some Includes, Added some comments