Moved away from webapp architecture