fixing bugs with package and import after refactoring and further add indent after \n in multiline comment