CARE #1: Moved controllers to one package