Changed to adding subdirs for the different modes.