Rearranged to have a build file