Fixed some namespace items, moved GenericTypes to Generic.