Restructured, added some content