Cleanup - got rid of some junk like the AdminServer and moved some files
into the a (new) configuration package.