attempting to sort out the dir structure