Restructure code base.