Fixed import location style issues