Remove daddr_t dependancies in the swap code. Move swblk_t and add