Submodule: Moved "pop" models into submodule