Restructure controller functions, private -> public -> routed