Merge pull request #21 from proppy/site-after-units

tech: move SITE after UNITS