Created Generic Service Base and removed old JS.