Renamed framework and add namespace