added proper subdirs