Rework build file