Made changes in structure

Conform
https://github.com/ItsAsbreuk/itsa-library/issues/287#issuecomment-55536
801