move package dirs under packages.  Update templates for generator. Fix nginx test