Moved helper-files up