Move and separate controllers