Project mess tidied up
Speaker example app continued.