add macros for module declar etc. (WIP)