This should not hurt.
Removed Macros.h, the only macro is only used in one file.
Add some hierarchy to the source files