Move calendar path and add user controller