Library classes structure refactoring.
Merge branch 'develop'