Solving the issue #82 - CI 2.x old class/file naming convention implementation.
Merge pull request #83 from ivantcholakov/development

Solving the issue #82 - CI 2.x old class/file naming convention.