Remove old classes
Added ServiceController with its interface