Move NCIP model into its own package, and move away from using master layout to ease testing