Updated folder structure for build server