Sorted more of the parent unit definitions into subfolders.