Controller Subfolder improvement