[#493] Move users tab (and supporting) files over to new location and refactor to make it compile cleanly