continued migration of node definitions to seperate files