Follow some reorganizations in Zn

Take into account the recently introduced 
Character-Encoding and Resource-Meta packages
Follow some reorganizations in Zn

Added the tests for the newly introduced 
Character-Encoding and Resource-Meta packages;
Added Zinc-Zodiac to the tests
merged and resolved conflicts (due to formatting)