Move data out of controller to data dir