re-org code structure