Some reorganization to make things useable.