Reorder some parts of build.xml for better output