Add more canonical variables, adjust folder structure