Moving libs to libraries