Some re-organization