Mjboyarov develop

Hello Roger, it's me again, I did some structure changes to lib folder, please check it out. 
See you later at 3:00pm