Move helper modules to subdirectory