Move server and client pillar data to separate files