updated to reflect file structure