Removing edit-server since I don't use it that often.
Massive cleanup and organization