Got rid of toollibs, moved some libraries around
4 files changed