Moved behaviours to their own package