Add shairport and rename

Change-Id: I85dade68d5c749e86855604bbdf782369a120340