Removed Model::Expansion and View::Expansion

In favor of Utils::Expansion