Separate dir added to hold .inc files. Moved macros.