Master stijn tdt ken traub

Note: the files within the AIDC folder are created by Ken Traub
inconsistent indentation