organizing classes, modules, imports
code cleanup, optimization, objectification continues
Merge branch 'stable'