small restructure

Just a bit of better organisation.
Extension changes