Slight data definition fix; moved to own directory