75ed1cedd9
Move some stuff around in order to make the later migration easier to parse. Change-Id: I1404a5b23fd1852be9d04661c2a0ba12c4bb78ec Signed-off-by: Stephen Finucane <sfinucan@redhat.com>