Directory input now supports subdirs

And cleaner core :)