shift the api modules around a bit. can now remove the api.common ns