[minor] Using a lib folder for 1 file is silly
[minor] Expose more readable API's
[minor] CodeStyle