added basic refactoring support
added basic refactoring support