optimise imports
add lots of ASF headers; move some that had crept below the package declaration (as they'd been accidentally javadoc-styled)