Add web svc, apps, new architecture