Files relocated. Fix line splitting. Fix sample parser description