BTCAR-DBG. File structure & naming rework