re-organize files
save only if changed
patch changes
apply some basic styles