changed to new directory setup