Reorganize tomcat7 state.