Moved system files to templates