move margarine to submodule