Reorganized some classes, added DB backup for later online setup