Some re-organisation