#12 reducing deploying time and some servlets re-naming