Pulled down Cake project to match production code structure