Fixed directories and merged shorewall packages