changes for new directory structure
syncing with eliana