clean bundle architecture, modify model namespace
end cleanup