Feature/aw refactor

@denis-yuen I have re-factored the BWA decider