added macros and data structures folder