reorganized ember structure