Moved WebApp and everything else under app