[ignore] Renaming classes. Temporary breaks functionality.
[refactor] Preparing to separate code. Created definition class.