moved attribute names to defines
added .orig && .rej files