Fishing stuff moved to its own module.