Improve macro system

 - Improve macro system
 - Fix organise import not working properly
 - Refactor function name