Changed build files to support new folder structure