modified directory structure to work with OS