Refaktor, code organization part I.