Library classes structure refactoring.
Merge branch 'master' into release