Many changes

Restructured files, tidied admin, added some new functions. & other
fixes