Add control structure indexing + bugfixes
Add missing control structure files