mv tomcat-7 to tomcat-7-conf

Change-Id: Ic403971b921dcc3b0794c439539c7007c33c34bc