Server folder was causing too much trouble.
More fixes to make Puppet happy.
Corrected require lines.