Sort library reorganization; Removed logic libraries for now