Split unball up into modules (more refactoring)