Excluded more files from the "old" libraries and included new ones instead. This should greatly clean up the code base.