renamed some folders and moved some macros around, added AV and EotS macros