Reorganizing things a bit for better encapsulation of creature creation