Start moving some generic classes into more generic packages