ECMS-5822: Update the code's structure