adopting codes with changed code in classes folder