Codebase move for NRS