Moved files around a bit, changed copyright
added two missing types
Builds for Core and Desktop