We decided to keep the subdirs, much debating happened