More separation and a template file for abstract