[FOLLOWUP][TASK] Allow command controller classes to reside in subfolders