[ADD] packages for grouping similar classes
Merge branch 'develop'