renamed api package to servlet
removed custom server handlers