changing folder dir structure
accounting for new dir structure