Move static namespace into its own file