0.c reduced, macro files added