updated code for the new folder structure