Working on Splitting Libraries

And incorporating them back into the project. Except I am having
problems with it...grrrr.