added addon config, reorganized includes