No longer requires CoFH Lib (on accident), moved a few classes.