Moved things to match Steve Fisher's conversion to WAR packaging