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

tech: move SITE after UNITS