More bug fixes
Re-designed /srv