Roll back subdirectories

Something odd is going on. So let's roll back so we have something that at least works.