move .h files to includes dir