rearranged controller/ files