Separated files. Functionality nearly regained, pending the fix of e-mail functionality.