Moving file inserts incorrect imports and removes needed imports for macro invocations

User picture
User picture
User picture