Move generated _gdc files up to main scan type directory and remove extra generated files