Add subdir support, support for clashing names and subdirs, and tests