Changed lib structure
Merge pull request #11 from AlexBalo/library-structure

Changed lib structure