Restructured XML files, Add build module