Updating build for new folder structure