Shruthi refactoring, work in progress