Move extracted tomcat to tomcat folder

The new tomcat maven zip produces a zip which is called apache-tomcat-version.
Let's move this (maven only lets us copy) to a folder called tomcat.
Add in Matthew's Marvelous Muller script