So I decided to use my first day of leave wisely and spent most of playing MC - oops! On a positive side though, we have a proper villager trading hall now. With a small melon, pumpkin and sugar cane farm on top of it
I've trapped the best villagers and put signs up with their trades. I've put some chests in there too with all the stuff you'll need to trade (carrots, pumpkins, melons, potatoes, wheat, books, emeralds etc.). If you need more emeralds, trade with the farmers. If you need more books, trade with the librarians for bookshelves and then break the bookshelves with your axe. If you do any trading then try to as many trades as possible so they don't lock their trades.