Updated old code

Moved old code to new library - currently not building!