Some research driven code re-org