Module structure improvements
Fix Key name