separated the code further, now everything is where it should be (until proven otherwise and this turns out as a huge mistake)