Changed to app + dist structure, included no Identity Option