Reorganized using controllers directory