addapting to new directory structure