Restructuring

Signed-off-by: Dominic Cronin <dominic.cronin@gmail.com>