Update Macros and remove uneeded folder