Move contrib/motters to na-legacy

Clean up legacy contrib