improve template, fix android update
Restructure template config