Re-organization and cleanup