Move behaviours into their own package