improvements in admin area and code reorganisation.