Move helper files to helpers directory