Added support for subfolders on controllers