Fix Pairs, add layout folder