further simplifications to directory structure