Added more functionality to class.Database plus cleanup of old files