Refactore 'instrument-classes' ant target