Reordganized architecture and added all necessary apps