Reorganised targets in build file.