[#59868124] eorganize folders and added tests