Some re-organization
Update