Move entity controllers to subfolders to prevent future naming collisions.