Updated libs, moved things around, renamed things around and cleaned up stuff