Restructure: Move static and template to their proper location.