reorganized project, removed files no longer needed, simplified server