Move cnapi module into its own folder