- move class Smarty_Template_Source into its own file - impelement all source processing into the classes it better belongs to