added changes to reflect changes in file structure