Cleaned out old stuff and moved it into the deprecated package