Total refactor complete

Signed-off-by: Tim Henderson <tim.tadh@gmail.com>