Reorganized directories. Updated server code.