Moved macros and its tests to subfolders.