Moved everything from WebContent into webapp