Clean up old macros.
Reorganized the file system structure.