Behaviour classes moved. Persistent behaviour objects done.