I did this, didn't feel separating it into separate files added clarity though.