Major Restructure

Restructure to separate the construction of the location and behavioural
models.