Rename Config and do other cleanup
Update API wrapper
Update data models