Luke Closs Move activity specific bits to it's own package