Restructure helper programs