Renamed files to match new split library scheme