Fixed missing commas and colons, items in the right directories