update macros, add main file, delete old macro file