Add Service folder with abstract manager. Additional changes...