updated directory structure, had been deprecated