Corrected readme files and layout of macros files

Corrected readme files and layout of macros files