Reorganize controllers, began admin creation