refactoring : removed markup.id, renamed entryPoint into in XML, ci-context as amd