Updated Build Project to support new folder structure