Update code to match new folder structure