Restructure helper files as needed