Organise utilities and helpers better. Update dist.