Nothing changed, but a bit of structure.
Made the commit to make sure I'm on the right way.