Adding NIM Form bundle
End of agency refactoring