Fix add imports of nested classes