Re-organization and clean up.