Move file only to ease vim switch between header and source

It is also more consistent with the header