further reorganize registration section