Restructured some routes