Fix treefrog

This fixes the bug with the restructure and allows Treefrog to run.