Adjusted helper file structure