add nwalign and swalign
reoragnize and simplify
reoragnize and simplify