Hey, thanks for looking into the code and thanks for your feedback! I will merge some files and hope it will be easier to read