Add refactor files