Restructure project for macros.
Restructure for macros.