Moved Types around. No further changes to keep git history intact.
Fixes after new Types structure.