Changing directory structure to allow for macro tests.