Design changes for upcoming phases

Reviewers: cf

Reviewed By: cf

Differential Revision: https://tails.corp.dropbox.com/D38773