Fixed include paths to match new folder structure