Oeganize domain entities
fix compile errors using mistake namespaces