Move zone file into its own folder and namespace