Move model features into top-level directory