trying to keep subdirs separate ...