Moving songbird into its own module.  Deprecating a few methods.