Project reorg
Fix missing content type issue