Add back convention plugin jar and its dependencies; Improve struts.xml
etc.