corrects names and requires to work with new directory structure