Rearrangement of the code, in order to add other parts of the CareToy Admin.