Changes to Directory Structure and Config.XML